From aeceb39d474b39556ac3685c3320f174a7f781cf Mon Sep 17 00:00:00 2001 From: Kristian Rietveld Date: Sat, 12 Jan 2002 15:58:56 +0000 Subject: [PATCH] revert Owen's change (using a strdupped string as object data), so the Sat Jan 12 16:57:31 2002 Kristian Rietveld * gtk/gtktreeview.c (gtk_tree_view_real_start_interactive_search): revert Owen's change (using a strdupped string as object data), so the interactive search works again --- ChangeLog | 8 +++++++- ChangeLog.pre-2-0 | 8 +++++++- ChangeLog.pre-2-10 | 8 +++++++- ChangeLog.pre-2-2 | 8 +++++++- ChangeLog.pre-2-4 | 8 +++++++- ChangeLog.pre-2-6 | 8 +++++++- ChangeLog.pre-2-8 | 8 +++++++- gtk/gtktreeview.c | 6 +++--- 8 files changed, 52 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index a85eccb125..10ca8f3a3d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sat Jan 12 16:57:31 2002 Kristian Rietveld + + * gtk/gtktreeview.c (gtk_tree_view_real_start_interactive_search): + revert Owen's change (using a strdupped string as object data), so + the interactive search works again + 2002-01-11 Havoc Pennington * gtk/gtklabel.c: put in more links to Pango markup format docs @@ -11,7 +17,7 @@ * gdk/win32/*.c: Add some more checks for failed GDI calls. If a call fails, don't use bogus values. - * gdk/win32/gdkcursor-win32.c (_gdk_win32_data_to_wcursor): Plug + gdk/win32/gdkcursor-win32.c (_gdk_win32_data_to_wcursor): Plug memory leak: g_free() the AND and XOR bitmaps after use. (_gdk_cursor_destroy): If we are destroying the current Windows cursor, set the Windows cursor to none first. diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index a85eccb125..10ca8f3a3d 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +Sat Jan 12 16:57:31 2002 Kristian Rietveld + + * gtk/gtktreeview.c (gtk_tree_view_real_start_interactive_search): + revert Owen's change (using a strdupped string as object data), so + the interactive search works again + 2002-01-11 Havoc Pennington * gtk/gtklabel.c: put in more links to Pango markup format docs @@ -11,7 +17,7 @@ * gdk/win32/*.c: Add some more checks for failed GDI calls. If a call fails, don't use bogus values. - * gdk/win32/gdkcursor-win32.c (_gdk_win32_data_to_wcursor): Plug + gdk/win32/gdkcursor-win32.c (_gdk_win32_data_to_wcursor): Plug memory leak: g_free() the AND and XOR bitmaps after use. (_gdk_cursor_destroy): If we are destroying the current Windows cursor, set the Windows cursor to none first. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index a85eccb125..10ca8f3a3d 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Sat Jan 12 16:57:31 2002 Kristian Rietveld + + * gtk/gtktreeview.c (gtk_tree_view_real_start_interactive_search): + revert Owen's change (using a strdupped string as object data), so + the interactive search works again + 2002-01-11 Havoc Pennington * gtk/gtklabel.c: put in more links to Pango markup format docs @@ -11,7 +17,7 @@ * gdk/win32/*.c: Add some more checks for failed GDI calls. If a call fails, don't use bogus values. - * gdk/win32/gdkcursor-win32.c (_gdk_win32_data_to_wcursor): Plug + gdk/win32/gdkcursor-win32.c (_gdk_win32_data_to_wcursor): Plug memory leak: g_free() the AND and XOR bitmaps after use. (_gdk_cursor_destroy): If we are destroying the current Windows cursor, set the Windows cursor to none first. diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index a85eccb125..10ca8f3a3d 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Sat Jan 12 16:57:31 2002 Kristian Rietveld + + * gtk/gtktreeview.c (gtk_tree_view_real_start_interactive_search): + revert Owen's change (using a strdupped string as object data), so + the interactive search works again + 2002-01-11 Havoc Pennington * gtk/gtklabel.c: put in more links to Pango markup format docs @@ -11,7 +17,7 @@ * gdk/win32/*.c: Add some more checks for failed GDI calls. If a call fails, don't use bogus values. - * gdk/win32/gdkcursor-win32.c (_gdk_win32_data_to_wcursor): Plug + gdk/win32/gdkcursor-win32.c (_gdk_win32_data_to_wcursor): Plug memory leak: g_free() the AND and XOR bitmaps after use. (_gdk_cursor_destroy): If we are destroying the current Windows cursor, set the Windows cursor to none first. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index a85eccb125..10ca8f3a3d 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Sat Jan 12 16:57:31 2002 Kristian Rietveld + + * gtk/gtktreeview.c (gtk_tree_view_real_start_interactive_search): + revert Owen's change (using a strdupped string as object data), so + the interactive search works again + 2002-01-11 Havoc Pennington * gtk/gtklabel.c: put in more links to Pango markup format docs @@ -11,7 +17,7 @@ * gdk/win32/*.c: Add some more checks for failed GDI calls. If a call fails, don't use bogus values. - * gdk/win32/gdkcursor-win32.c (_gdk_win32_data_to_wcursor): Plug + gdk/win32/gdkcursor-win32.c (_gdk_win32_data_to_wcursor): Plug memory leak: g_free() the AND and XOR bitmaps after use. (_gdk_cursor_destroy): If we are destroying the current Windows cursor, set the Windows cursor to none first. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index a85eccb125..10ca8f3a3d 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Sat Jan 12 16:57:31 2002 Kristian Rietveld + + * gtk/gtktreeview.c (gtk_tree_view_real_start_interactive_search): + revert Owen's change (using a strdupped string as object data), so + the interactive search works again + 2002-01-11 Havoc Pennington * gtk/gtklabel.c: put in more links to Pango markup format docs @@ -11,7 +17,7 @@ * gdk/win32/*.c: Add some more checks for failed GDI calls. If a call fails, don't use bogus values. - * gdk/win32/gdkcursor-win32.c (_gdk_win32_data_to_wcursor): Plug + gdk/win32/gdkcursor-win32.c (_gdk_win32_data_to_wcursor): Plug memory leak: g_free() the AND and XOR bitmaps after use. (_gdk_cursor_destroy): If we are destroying the current Windows cursor, set the Windows cursor to none first. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index a85eccb125..10ca8f3a3d 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Sat Jan 12 16:57:31 2002 Kristian Rietveld + + * gtk/gtktreeview.c (gtk_tree_view_real_start_interactive_search): + revert Owen's change (using a strdupped string as object data), so + the interactive search works again + 2002-01-11 Havoc Pennington * gtk/gtklabel.c: put in more links to Pango markup format docs @@ -11,7 +17,7 @@ * gdk/win32/*.c: Add some more checks for failed GDI calls. If a call fails, don't use bogus values. - * gdk/win32/gdkcursor-win32.c (_gdk_win32_data_to_wcursor): Plug + gdk/win32/gdkcursor-win32.c (_gdk_win32_data_to_wcursor): Plug memory leak: g_free() the AND and XOR bitmaps after use. (_gdk_cursor_destroy): If we are destroying the current Windows cursor, set the Windows cursor to none first. diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index eecd8f1d0a..e3b53ddc45 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -6434,9 +6434,9 @@ gtk_tree_view_real_start_interactive_search (GtkTreeView *tree_view) /* position window */ - gtk_object_set_data_full (GTK_OBJECT (window), "gtk-tree-view-text", - g_strdup (gtk_entry_get_text (GTK_ENTRY (entry))), - (GDestroyNotify) g_free); + /* yes, we point to the entry's private text thing here, a bit evil */ + gtk_object_set_data (GTK_OBJECT (window), "gtk-tree-view-text", + gtk_entry_get_text (GTK_ENTRY (entry))); gtk_object_set_data (GTK_OBJECT (tree_view), GTK_TREE_VIEW_SEARCH_DIALOG_KEY, window); -- 2.30.2